Merge http://git.denx.de/u-boot-samsung

Signed-off-by: Tom Rini <[email protected]>
Conflicts:
	configs/peach-pi_defconfig
	configs/peach-pit_defconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc configs/odroid-xu3_defconfig
Simple merge

diff --cc configs/peach-pi_defconfig
index 3c403ba8da7146293f9b9e7816954fc1e8ae6380,fea8bde324431b4a21164975b932ab02a7be6692..313fb03e661439a67a717da43a78f455b7e652e6
--- 1/configs/peach-pi_defconfig
--- 2/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@@ -55,8 -58,8 +58,10 @@@ CONFIG_EXYNOS_SPI=
  CONFIG_TPM_TIS_INFINEON=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
+ CONFIG_DM_VIDEO=y
+ CONFIG_DISPLAY=y
  CONFIG_VIDEO_BRIDGE=y
  CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
  CONFIG_TPM=y

diff --cc configs/peach-pit_defconfig
index bfa361498cbd5933b3397b10ef14d3d8668ae716,41c3d1208de8bdbbe414939407dbcc83b715f0c5..eb5558a4089b0c6f938ff9f0fc7fc124d2c17c83
--- 1/configs/peach-pit_defconfig
--- 2/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@@ -55,8 -58,8 +58,10 @@@ CONFIG_EXYNOS_SPI=
  CONFIG_TPM_TIS_INFINEON=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
+ CONFIG_DM_VIDEO=y
+ CONFIG_DISPLAY=y
  CONFIG_VIDEO_BRIDGE=y
  CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
  CONFIG_TPM=y

diff --cc configs/smdk5420_defconfig
Simple merge

diff --cc include/configs/exynos5-common.h
Simple merge

diff --cc include/configs/smdk5420.h
Simple merge